From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 17:56:17 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a218d7fbf59ed0896f02bf50ed1702c26696cd30;p=emacs.git

merge from trunk
---

a218d7fbf59ed0896f02bf50ed1702c26696cd30